Autogenerated HTML docs for v1.3.2-g8611
diff --git a/git-add.html b/git-add.html index 7c63b24..d7859cc 100644 --- a/git-add.html +++ b/git-add.html
@@ -307,7 +307,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -385,7 +385,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Mar-2006 00:31:20 UTC +Last updated 05-May-2006 23:14:10 UTC </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index ae24547..5e31129 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -26,7 +26,7 @@ -v:: Be verbose. ---:: +\--:: This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options).
diff --git a/git-checkout-index.html b/git-checkout-index.html index b2e1a2a..2824db5 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html
@@ -379,7 +379,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -511,7 +511,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Mar-2006 05:16:20 UTC +Last updated 05-May-2006 23:14:10 UTC </div> </div> </body>
diff --git a/git-checkout-index.txt b/git-checkout-index.txt index 09bd6a5..765c173 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt
@@ -63,7 +63,7 @@ Only meaningful with `--stdin`; paths are separated with NUL character instead of LF. ---:: +\--:: Do not interpret any more arguments as options. The order of the flags used to matter, but not anymore.
diff --git a/git-cherry.html b/git-cherry.html index c368028..39a365b 100644 --- a/git-cherry.html +++ b/git-cherry.html
@@ -276,11 +276,17 @@ </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> -<p>Each commit between the fork-point and <head> is examined, and compared against -the change each commit between the fork-point and <upstream> introduces. -Commits already included in upstream are prefixed with <em>-</em> (meaning "drop from -my local pull"), while commits missing from upstream are prefixed with <em>+</em> -(meaning "add to the updated upstream").</p> +<p>The changeset (or "diff") of each commit between the fork-point and <head> +is compared against each commit between the fork-point and <upstream>.</p> +<p>Every commit with a changeset that doesn't exist in the other branch +has its id (sha1) reported, prefixed by a symbol. Those existing only +in the <upstream> branch are prefixed with a minus (-) sign, and those +that only exist in the <head> branch are prefixed with a plus (+) symbol.</p> +<p>Because git-cherry compares the changeset rather than the commit id +(sha1), you can use git-cherry to find out if a commit you made locally +has been applied <upstream> under a different commit id. For example, +this will happen if you're feeding patches <upstream> via email rather +than pushing or pulling commits directly.</p> </div> <h2>OPTIONS</h2> <div class="sectionbody"> @@ -325,7 +331,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Mar-2006 00:31:22 UTC +Last updated 05-May-2006 23:14:11 UTC </div> </div> </body>
diff --git a/git-cherry.txt b/git-cherry.txt index 9a5e371..893baaa 100644 --- a/git-cherry.txt +++ b/git-cherry.txt
@@ -11,11 +11,20 @@ DESCRIPTION ----------- -Each commit between the fork-point and <head> is examined, and compared against -the change each commit between the fork-point and <upstream> introduces. -Commits already included in upstream are prefixed with '-' (meaning "drop from -my local pull"), while commits missing from upstream are prefixed with '+' -(meaning "add to the updated upstream"). +The changeset (or "diff") of each commit between the fork-point and <head> +is compared against each commit between the fork-point and <upstream>. + +Every commit with a changeset that doesn't exist in the other branch +has its id (sha1) reported, prefixed by a symbol. Those existing only +in the <upstream> branch are prefixed with a minus (-) sign, and those +that only exist in the <head> branch are prefixed with a plus (+) symbol. + +Because git-cherry compares the changeset rather than the commit id +(sha1), you can use git-cherry to find out if a commit you made locally +has been applied <upstream> under a different commit id. For example, +this will happen if you're feeding patches <upstream> via email rather +than pushing or pulling commits directly. + OPTIONS -------
diff --git a/git-clone.html b/git-clone.html index 1d3b451..1e4994a 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -423,7 +423,9 @@ </p> </dd> </dl> -<h3>Examples</h3> +</div> +<h2>Examples</h2> +<div class="sectionbody"> <dl> <dt> Clone from upstream @@ -494,7 +496,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Apr-2006 09:44:08 UTC +Last updated 05-May-2006 23:14:11 UTC </div> </div> </body>
diff --git a/git-clone.txt b/git-clone.txt index 131e445..b333f51 100644 --- a/git-clone.txt +++ b/git-clone.txt
@@ -101,7 +101,7 @@ is not allowed. Examples -~~~~~~~~ +-------- Clone from upstream:: +
diff --git a/git-commit.html b/git-commit.html index ff315aa..06757e2 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -427,7 +427,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -507,7 +507,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 05-Apr-2006 23:07:59 UTC +Last updated 05-May-2006 23:14:12 UTC </div> </div> </body>
diff --git a/git-commit.txt b/git-commit.txt index 0a7365b..38df59c 100644 --- a/git-commit.txt +++ b/git-commit.txt
@@ -106,7 +106,7 @@ index and the latest commit does not match on the specified paths to avoid confusion. ---:: +\--:: Do not interpret any more arguments as options. <file>...::
diff --git a/git-imap-send.html b/git-imap-send.html index aee9c16..2b68e59 100644 --- a/git-imap-send.html +++ b/git-imap-send.html
@@ -289,18 +289,17 @@ configuration file (shown with examples):</p> <div class="literalblock"> <div class="content"> -<pre><tt>Folder = "INBOX.Drafts"</tt></pre> -</div></div> -<div class="literalblock"> -<div class="content"> -<pre><tt>Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"</tt></pre> -</div></div> -<div class="literalblock"> -<div class="content"> -<pre><tt>Host = imap.server.com -User = bob -Password = pwd -Port = 143</tt></pre> +<pre><tt>[imap] + Folder = "INBOX.Drafts" + +[imap] + Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null" + +[imap] + Host = imap.server.com + User = bob + Pass = pwd + Port = 143</tt></pre> </div></div> </div> <h2>BUGS</h2> @@ -321,7 +320,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 06-Apr-2006 23:15:34 UTC +Last updated 05-May-2006 23:14:12 UTC </div> </div> </body>
diff --git a/git-imap-send.txt b/git-imap-send.txt index cfc0d88..eca9e9c 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt
@@ -29,6 +29,7 @@ git-imap-send requires the following values in the repository configuration file (shown with examples): +.......................... [imap] Folder = "INBOX.Drafts" @@ -38,8 +39,9 @@ [imap] Host = imap.server.com User = bob - Password = pwd + Pass = pwd Port = 143 +.......................... BUGS
diff --git a/git-log.html b/git-log.html index d320426..4c8d3c0 100644 --- a/git-log.html +++ b/git-log.html
@@ -349,7 +349,7 @@ </p> </dd> <dt> -git log --since="2 weeks ago" — gitk +git log --since="2 weeks ago" -- gitk </dt> <dd> <p> @@ -384,7 +384,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 29-Apr-2006 07:01:34 UTC +Last updated 05-May-2006 23:14:12 UTC </div> </div> </body>
diff --git a/git-log.txt b/git-log.txt index af378ff..c9ffff7 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -51,7 +51,7 @@ Show all commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories -git log --since="2 weeks ago" -- gitk:: +git log --since="2 weeks ago" \-- gitk:: Show the changes during the last two weeks to the file 'gitk'. The "--" is necessary to avoid confusion with the *branch* named
diff --git a/git-ls-files.html b/git-ls-files.html index 396a0ef..ec6f1d8 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -510,7 +510,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -678,7 +678,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 28-Mar-2006 00:27:56 UTC +Last updated 05-May-2006 23:14:13 UTC </div> </div> </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt index 796d049..a29c633 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt
@@ -106,7 +106,7 @@ lines, show only handful hexdigits prefix. Non default number of digits can be specified with --abbrev=<n>. ---:: +\--:: Do not interpret any more arguments as options. <file>::
diff --git a/git-merge-index.html b/git-merge-index.html index 28b50e4..f2235fe 100644 --- a/git-merge-index.html +++ b/git-merge-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.1" /> +<meta name="generator" content="AsciiDoc 7.0.2" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | — | <file>*)</p> +<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | -- | <file>*)</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -285,7 +285,7 @@ <div class="sectionbody"> <dl> <dt> -— +-- </dt> <dd> <p> @@ -372,7 +372,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 27-Dec-2005 00:16:20 PDT +Last updated 05-May-2006 23:14:13 UTC </div> </div> </body> diff --git a/git-merge-index.txt b/git-merge-index.txt index fbc986a..332e023 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*) +'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*) DESCRIPTION ----------- @@ -19,7 +19,7 @@ OPTIONS ------- ---:: +\--:: Do not interpret any more arguments as options. -a::
diff --git a/git-name-rev.html b/git-name-rev.html index ff04344..7ea2e87 100644 --- a/git-name-rev.html +++ b/git-name-rev.html
@@ -318,7 +318,8 @@ <p>Enter git-name-rev:</p> <div class="listingblock"> <div class="content"> -<pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a</tt></pre> +<pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a +33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940</tt></pre> </div></div> <p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p> <p>Another nice thing you can do is:</p> @@ -341,7 +342,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Mar-2006 00:31:29 UTC +Last updated 05-May-2006 23:14:14 UTC </div> </div> </body>
diff --git a/git-name-rev.txt b/git-name-rev.txt index 6870708..ffaa004 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt
@@ -41,6 +41,7 @@ ------------ % git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a +33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940 ------------ Now you are wiser, because you know that it happened 940 revisions before v0.99.
diff --git a/git-prune.html b/git-prune.html index 29f2ec4..2c11832 100644 --- a/git-prune.html +++ b/git-prune.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.1" /> +<meta name="generator" content="AsciiDoc 7.0.2" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -297,7 +297,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -340,7 +340,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 27-Dec-2005 00:16:28 PDT +Last updated 05-May-2006 23:14:14 UTC </div> </div> </body> diff --git a/git-prune.txt b/git-prune.txt index f694fcb..a11e303 100644 --- a/git-prune.txt +++ b/git-prune.txt
@@ -28,7 +28,7 @@ Do not remove anything; just report what it would remove. ---:: +\--:: Do not interpret any more arguments as options. <head>...::
diff --git a/git-repack.html b/git-repack.html index 0081cb1..a258d3b 100644 --- a/git-repack.html +++ b/git-repack.html
@@ -307,6 +307,7 @@ <p> After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. + Also runs <a href="git-prune-packed.html">git-prune-packed(1)</a>. </p> </dd> <dt> @@ -366,7 +367,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 05-Mar-2006 09:02:49 UTC +Last updated 05-May-2006 23:14:14 UTC </div> </div> </body>
diff --git a/git-repack.txt b/git-repack.txt index d2f9a44..9516227 100644 --- a/git-repack.txt +++ b/git-repack.txt
@@ -38,6 +38,7 @@ -d:: After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. + Also runs gitlink:git-prune-packed[1]. -l:: Pass the `--local` option to `git pack-objects`, see
diff --git a/git-repo-config.html b/git-repo-config.html index 66606be..de05a74 100644 --- a/git-repo-config.html +++ b/git-repo-config.html
@@ -295,16 +295,16 @@ convert the value to the canonical form (simple decimal number for int, a "true" or "false" string for bool). If no type specifier is passed, no checks or transformations are performed on the value.</p> -<p>This command will fail if</p> +<p>This command will fail if:</p> <ol> <li> <p> -.git/config is invalid, +The .git/config file is invalid, </p> </li> <li> <p> -.git/config can not be written to, +Can not write to .git/config, </p> </li> <li> @@ -829,7 +829,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 04-May-2006 08:01:37 UTC +Last updated 05-May-2006 23:14:15 UTC </div> </div> </body>
diff --git a/git-repo-config.txt b/git-repo-config.txt index ddcf523..fd44f62 100644 --- a/git-repo-config.txt +++ b/git-repo-config.txt
@@ -34,10 +34,10 @@ a "true" or "false" string for bool). If no type specifier is passed, no checks or transformations are performed on the value. -This command will fail if +This command will fail if: -. .git/config is invalid, -. .git/config can not be written to, +. The .git/config file is invalid, +. Can not write to .git/config, . no section was provided, . the section or key is invalid, . you try to unset an option which does not exist, or
diff --git a/git-reset.html b/git-reset.html index 79d8cf9..8be5de3 100644 --- a/git-reset.html +++ b/git-reset.html
@@ -327,7 +327,9 @@ </p> </dd> </dl> -<h3>Examples</h3> +</div> +<h2>Examples</h2> +<div class="sectionbody"> <dl> <dt> Undo a commit and redo @@ -564,7 +566,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 29-Apr-2006 07:01:34 UTC +Last updated 05-May-2006 23:14:15 UTC </div> </div> </body>
diff --git a/git-reset.txt b/git-reset.txt index ebcfe5e..b27399d 100644 --- a/git-reset.txt +++ b/git-reset.txt
@@ -43,7 +43,7 @@ Commit to make the current HEAD. Examples -~~~~~~~~ +-------- Undo a commit and redo:: +
diff --git a/git-rm.html b/git-rm.html index ec5b784..d9996a1 100644 --- a/git-rm.html +++ b/git-rm.html
@@ -318,7 +318,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -399,7 +399,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Mar-2006 00:31:35 UTC +Last updated 05-May-2006 23:14:16 UTC </div> </div> </body>
diff --git a/git-rm.txt b/git-rm.txt index c9c3088..66fc478 100644 --- a/git-rm.txt +++ b/git-rm.txt
@@ -32,7 +32,7 @@ -v:: Be verbose. ---:: +\--:: This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options).
diff --git a/git-unpack-objects.html b/git-unpack-objects.html index abd89f3..3c6f996 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html
@@ -276,9 +276,14 @@ </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads a packed archive (.pack) from the standard input, and -expands the objects contained in the pack into "one-file -one-object" format in $GIT_OBJECT_DIRECTORY.</p> +<p>Read a packed archive (.pack) from the standard input, expanding +the objects contained within and writing them into the repository in +"loose" (one object per file) format.</p> +<p>Objects that already exist in the repository will <strong>not</strong> be unpacked +from the pack-file. Therefore, nothing will be unpacked if you use +this command on a pack-file that exists within the target repository.</p> +<p>Please see the <tt>git-repack</tt> documentation for options to generate +new packs and replace existing ones.</p> </div> <h2>OPTIONS</h2> <div class="sectionbody"> @@ -317,7 +322,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Mar-2006 00:31:38 UTC +Last updated 05-May-2006 23:14:16 UTC </div> </div> </body>
diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index 1828062..c20b38b 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt
@@ -13,9 +13,16 @@ DESCRIPTION ----------- -Reads a packed archive (.pack) from the standard input, and -expands the objects contained in the pack into "one-file -one-object" format in $GIT_OBJECT_DIRECTORY. +Read a packed archive (.pack) from the standard input, expanding +the objects contained within and writing them into the repository in +"loose" (one object per file) format. + +Objects that already exist in the repository will *not* be unpacked +from the pack-file. Therefore, nothing will be unpacked if you use +this command on a pack-file that exists within the target repository. + +Please see the `git-repack` documentation for options to generate +new packs and replace existing ones. OPTIONS -------
diff --git a/git-update-index.html b/git-update-index.html index 2aed335..891afd7 100644 --- a/git-update-index.html +++ b/git-update-index.html
@@ -463,7 +463,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -705,7 +705,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 04-May-2006 00:46:26 UTC +Last updated 05-May-2006 23:14:17 UTC </div> </div> </body>
diff --git a/git-update-index.txt b/git-update-index.txt index 23f2b6f..57177c7 100644 --- a/git-update-index.txt +++ b/git-update-index.txt
@@ -113,7 +113,7 @@ Only meaningful with `--stdin`; paths are separated with NUL character instead of LF. ---:: +\--:: Do not interpret any more arguments as options. <file>::
diff --git a/git-verify-pack.html b/git-verify-pack.html index e1b5306..bf5773e 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html
@@ -301,7 +301,7 @@ </p> </dd> <dt> -— +-- </dt> <dd> <p> @@ -338,7 +338,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Mar-2006 00:31:38 UTC +Last updated 05-May-2006 23:14:17 UTC </div> </div> </body>
diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 4962d69..7a6132b 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt
@@ -25,7 +25,7 @@ -v:: After verifying the pack, show list of objects contained in the pack. ---:: +\--:: Do not interpret any more arguments as options. OUTPUT FORMAT
diff --git a/git-whatchanged.html b/git-whatchanged.html index 48be59e..59d2a6f 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html
@@ -358,7 +358,7 @@ </p> </dd> <dt> -git-whatchanged --since="2 weeks ago" — gitk +git-whatchanged --since="2 weeks ago" -- gitk </dt> <dd> <p> @@ -384,7 +384,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 24-Mar-2006 08:11:02 UTC +Last updated 05-May-2006 23:14:17 UTC </div> </div> </body>
diff --git a/git-whatchanged.txt b/git-whatchanged.txt index 641cb7e..e8f21d0 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt
@@ -58,7 +58,7 @@ Show as patches the commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories -git-whatchanged --since="2 weeks ago" -- gitk:: +git-whatchanged --since="2 weeks ago" \-- gitk:: Show the changes during the last two weeks to the file 'gitk'. The "--" is necessary to avoid confusion with the *branch* named
diff --git a/gitk.html b/gitk.html index 1fba904..e4ff21c 100644 --- a/gitk.html +++ b/gitk.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.1" /> +<meta name="generator" content="AsciiDoc 7.0.2" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -312,7 +312,7 @@ </p> </dd> <dt> -gitk --since="2 weeks ago" — gitk +gitk --since="2 weeks ago" -- gitk </dt> <dd> <p> @@ -337,7 +337,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 27-Dec-2005 00:16:58 PDT +Last updated 05-May-2006 23:14:18 UTC </div> </div> </body> diff --git a/gitk.txt b/gitk.txt index eb126d7..cb482bf 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -31,7 +31,7 @@ Show as the changes since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories -gitk --since="2 weeks ago" -- gitk:: +gitk --since="2 weeks ago" \-- gitk:: Show the changes during the last two weeks to the file 'gitk'. The "--" is necessary to avoid confusion with the *branch* named
